Home Explore Help
Register Sign In
J1X
/
huginn
Watch 2
Star 0
Fork 0

Browse Source
bumps for CVE-2015-3226, CVE-2015-3227, CVE-2015-1840 and CVE-2015-3225

Andrew Cantino 9 years ago
parent
caa2132b99
commit
0552afa324
2 changed files with 52 additions and 56 deletions
Show Diff Stats
  1. 5 5
      Gemfile
  2. 47 51
      Gemfile.lock

+ 5 - 5
Gemfile
View File 

@@ -63,14 +63,14 @@ gem 'em-http-request', '~> 1.1.2'
63 63 
 gem 'faraday', '~> 0.9.0'
64 64 
 gem 'faraday_middleware'
65 65 
 gem 'feed-normalizer'
66 
-gem 'font-awesome-sass', '~> 4.3'
66 
+gem 'font-awesome-sass', '~> 4.3.2'
67 67 
 gem 'foreman', '~> 0.63.0'
68 68 
 # geokit-rails doesn't work with geokit 1.8.X but it specifies ~> 1.5
69 69 
 # in its own Gemfile.
70 70 
 gem 'geokit', '~> 1.8.4'
71 71 
 gem 'geokit-rails', '~> 2.0.1'
72 72 
 gem 'httparty', '~> 0.13'
73 
-gem 'jquery-rails', '~> 3.1.0'
73 
+gem 'jquery-rails', '~> 3.1.3'
74 74 
 gem 'json', '~> 1.8.1'
75 75 
 gem 'jsonpath', '~> 0.5.6'
76 76 
 gem 'kaminari', '~> 0.16.1'
 
@@ -81,9 +81,9 @@ gem 'mysql2', '~> 0.3.16'
81 81 
 gem 'multi_xml'
82 82 
 gem 'nokogiri', '~> 1.6.4'
83 83 
 gem 'omniauth'
84 
-gem 'rails' , '4.2.1'
84 
+gem 'rails' , '4.2.2'
85 85 
 gem 'rufus-scheduler', '~> 3.0.8', require: false
86 
-gem 'sass-rails',   '~> 5.0'
86 
+gem 'sass-rails',   '~> 5.0.3'
87 87 
 gem 'select2-rails', '~> 3.5.4'
88 88 
 gem 'spectrum-rails'
89 89 
 gem 'string-scrub'	# for ruby <2.1
 
@@ -117,7 +117,7 @@ group :development do
117 117 
 end
118 118
119 119 
 group :production do
120 
-  gem 'rack'
120 
+  gem 'rack', '> 1.5.0'
121 121 
 end
122 122
123 123 
 # Platform requirements.

+ 47 - 51
Gemfile.lock
View File 

@@ -32,36 +32,36 @@ GEM
32 32 
   remote: https://rubygems.org/
33 33 
   specs:
34 34 
     ace-rails-ap (2.0.1)
35 
-    actionmailer (4.2.1)
36 
-      actionpack (= 4.2.1)
37 
-      actionview (= 4.2.1)
38 
-      activejob (= 4.2.1)
35 
+    actionmailer (4.2.2)
36 
+      actionpack (= 4.2.2)
37 
+      actionview (= 4.2.2)
38 
+      activejob (= 4.2.2)
39 39 
       mail (~> 2.5, >= 2.5.4)
40 40 
       rails-dom-testing (~> 1.0, >= 1.0.5)
41 
-    actionpack (4.2.1)
42 
-      actionview (= 4.2.1)
43 
-      activesupport (= 4.2.1)
41 
+    actionpack (4.2.2)
42 
+      actionview (= 4.2.2)
43 
+      activesupport (= 4.2.2)
44 44 
       rack (~> 1.6)
45 45 
       rack-test (~> 0.6.2)
46 46 
       rails-dom-testing (~> 1.0, >= 1.0.5)
47 47 
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
48 
-    actionview (4.2.1)
49 
-      activesupport (= 4.2.1)
48 
+    actionview (4.2.2)
49 
+      activesupport (= 4.2.2)
50 50 
       builder (~> 3.1)
51 51 
       erubis (~> 2.7.0)
52 52 
       rails-dom-testing (~> 1.0, >= 1.0.5)
53 53 
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
54 
-    activejob (4.2.1)
55 
-      activesupport (= 4.2.1)
54 
+    activejob (4.2.2)
55 
+      activesupport (= 4.2.2)
56 56 
       globalid (>= 0.3.0)
57 
-    activemodel (4.2.1)
58 
-      activesupport (= 4.2.1)
57 
+    activemodel (4.2.2)
58 
+      activesupport (= 4.2.2)
59 59 
       builder (~> 3.1)
60 
-    activerecord (4.2.1)
61 
-      activemodel (= 4.2.1)
62 
-      activesupport (= 4.2.1)
60 
+    activerecord (4.2.2)
61 
+      activemodel (= 4.2.2)
62 
+      activesupport (= 4.2.2)
63 63 
       arel (~> 6.0)
64 
-    activesupport (4.2.1)
64 
+    activesupport (4.2.2)
65 65 
       i18n (~> 0.7)
66 66 
       json (~> 1.7, >= 1.7.7)
67 67 
       minitest (~> 5.1)
 
@@ -159,7 +159,7 @@ GEM
159 159 
       hpricot (>= 0.6)
160 160 
       simple-rss (>= 1.1)
161 161 
     ffi (1.9.5)
162 
-    font-awesome-sass (4.3.1)
162 
+    font-awesome-sass (4.3.2.1)
163 163 
       sass (~> 3.2)
164 164 
     forecast_io (2.0.0)
165 165 
       faraday
 
@@ -174,7 +174,7 @@ GEM
174 174 
     geokit-rails (2.0.1)
175 175 
       geokit (~> 1.5)
176 176 
       rails (>= 3.0)
177 
-    globalid (0.3.3)
177 
+    globalid (0.3.5)
178 178 
       activesupport (>= 4.1.0)
179 179 
     google-api-client (0.7.1)
180 180 
       addressable (>= 2.3.2)
 
@@ -202,7 +202,6 @@ GEM
202 202 
       rspec (>= 2.14, < 4.0)
203 203 
     hashie (2.0.5)
204 204 
     haversine (0.3.0)
205 
-    hike (1.2.3)
206 205 
     hipchat (1.2.0)
207 206 
       httparty
208 207 
     hitimes (1.2.2)
 
@@ -221,10 +220,10 @@ GEM
221 220 
     hypdf (1.0.7)
222 221 
       httmultiparty (= 0.3.10)
223 222 
     i18n (0.7.0)
224 
-    jquery-rails (3.1.1)
223 
+    jquery-rails (3.1.3)
225 224 
       railties (>= 3.0, < 5.0)
226 225 
       thor (>= 0.14, < 2.0)
227 
-    json (1.8.2)
226 
+    json (1.8.3)
228 227 
     jsonpath (0.5.6)
229 228 
       multi_json
230 229 
     jwt (1.4.1)
 
@@ -241,7 +240,7 @@ GEM
241 240 
       celluloid (>= 0.15.2)
242 241 
       rb-fsevent (>= 0.9.3)
243 242 
       rb-inotify (>= 0.9)
244 
-    loofah (2.0.1)
243 
+    loofah (2.0.2)
245 244 
       nokogiri (>= 1.5.9)
246 245 
     lumberjack (1.0.9)
247 246 
     macaddr (1.7.1)
 
@@ -251,12 +250,12 @@ GEM
251 250 
     memoizable (0.4.2)
252 251 
       thread_safe (~> 0.3, >= 0.3.1)
253 252 
     method_source (0.8.2)
254 
-    mime-types (2.5)
253 
+    mime-types (2.6.1)
255 254 
     mini_magick (4.2.3)
256 255 
     mini_portile (0.6.2)
257 
-    minitest (5.5.1)
256 
+    minitest (5.7.0)
258 257 
     mqtt (0.3.1)
259 
-    multi_json (1.11.0)
258 
+    multi_json (1.11.1)
260 259 
     multi_xml (0.5.5)
261 260 
     multipart-post (2.0.0)
262 261 
     mysql2 (0.3.16)
 
@@ -306,19 +305,19 @@ GEM
306 305 
       pry (>= 0.9.10)
307 306 
     quiet_assets (1.1.0)
308 307 
       railties (>= 3.1, < 5.0)
309 
-    rack (1.6.1)
308 
+    rack (1.6.4)
310 309 
     rack-test (0.6.3)
311 310 
       rack (>= 1.0)
312 
-    rails (4.2.1)
313 
-      actionmailer (= 4.2.1)
314 
-      actionpack (= 4.2.1)
315 
-      actionview (= 4.2.1)
316 
-      activejob (= 4.2.1)
317 
-      activemodel (= 4.2.1)
318 
-      activerecord (= 4.2.1)
319 
-      activesupport (= 4.2.1)
311 
+    rails (4.2.2)
312 
+      actionmailer (= 4.2.2)
313 
+      actionpack (= 4.2.2)
314 
+      actionview (= 4.2.2)
315 
+      activejob (= 4.2.2)
316 
+      activemodel (= 4.2.2)
317 
+      activerecord (= 4.2.2)
318 
+      activesupport (= 4.2.2)
320 319 
       bundler (>= 1.3.0, < 2.0)
321 
-      railties (= 4.2.1)
320 
+      railties (= 4.2.2)
322 321 
       sprockets-rails
323 322 
     rails-deprecated_sanitizer (1.0.3)
324 323 
       activesupport (>= 4.2.0.alpha)
 
@@ -333,9 +332,9 @@ GEM
333 332 
       rails_stdout_logging
334 333 
     rails_serve_static_assets (0.0.4)
335 334 
     rails_stdout_logging (0.0.3)
336 
-    railties (4.2.1)
337 
-      actionpack (= 4.2.1)
338 
-      activesupport (= 4.2.1)
335 
+    railties (4.2.2)
336 
+      actionpack (= 4.2.2)
337 
+      activesupport (= 4.2.2)
339 338 
       rake (>= 0.8.7)
340 339 
       thor (>= 0.18.1, < 2.0)
341 340 
     raindrops (0.13.0)
 
@@ -387,8 +386,8 @@ GEM
387 386 
     rufus-scheduler (3.0.9)
388 387 
       tzinfo
389 388 
     safe_yaml (1.0.4)
390 
-    sass (3.4.12)
391 
-    sass-rails (5.0.1)
389 
+    sass (3.4.14)
390 
+    sass-rails (5.0.3)
392 391 
       railties (>= 4.0.0, < 5.0)
393 392 
       sass (~> 3.1)
394 393 
       sprockets (>= 2.8, < 4.0)
 
@@ -417,12 +416,9 @@ GEM
417 416 
     spring (1.3.6)
418 417 
     spring-commands-rspec (1.0.4)
419 418 
       spring (>= 0.9.1)
420 
-    sprockets (2.12.3)
421 
-      hike (~> 1.2)
422 
-      multi_json (~> 1.0)
419 
+    sprockets (3.2.0)
423 420 
       rack (~> 1.0)
424 
-      tilt (~> 1.1, != 1.3.0)
425 
-    sprockets-rails (2.2.4)
421 
+    sprockets-rails (2.3.1)
426 422 
       actionpack (>= 3.0)
427 423 
       activesupport (>= 3.0)
428 424 
       sprockets (>= 2.8, < 4.0)
 
@@ -515,7 +511,7 @@ DEPENDENCIES
515 511 
   faraday_middleware
516 512 
   feed-normalizer
517 513 
   ffi (>= 1.9.4)
518 
-  font-awesome-sass (~> 4.3)
514 
+  font-awesome-sass (~> 4.3.2)
519 515 
   forecast_io (~> 2.0.0)
520 516 
   foreman (~> 0.63.0)
521 517 
   geokit (~> 1.8.4)
 
@@ -528,7 +524,7 @@ DEPENDENCIES
528 524 
   hipchat (~> 1.2.0)
529 525 
   httparty (~> 0.13)
530 526 
   hypdf (~> 1.0.7)
531 
-  jquery-rails (~> 3.1.0)
527 
+  jquery-rails (~> 3.1.3)
532 528 
   json (~> 1.8.1)
533 529 
   jsonpath (~> 0.5.6)
534 530 
   kaminari (~> 0.16.1)
 
@@ -550,8 +546,8 @@ DEPENDENCIES
550 546 
   protected_attributes (~> 1.0.8)
551 547 
   pry-rails
552 548 
   quiet_assets
553 
-  rack
554 
-  rails (= 4.2.1)
549 
+  rack (> 1.5.0)
550 
+  rails (= 4.2.2)
555 551 
   rails_12factor
556 552 
   rr
557 553 
   rspec (~> 3.2)
 
@@ -561,7 +557,7 @@ DEPENDENCIES
561 557 
   rturk (~> 2.12.1)
562 558 
   ruby-growl (~> 4.1.0)
563 559 
   rufus-scheduler (~> 3.0.8)
564 
-  sass-rails (~> 5.0)
560 
+  sass-rails (~> 5.0.3)
565 561 
   select2-rails (~> 3.5.4)
566 562 
   shoulda-matchers
567 563 
   slack-notifier (~> 1.0.0)